# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1046.1.347+1.1046.573.1 -> 1.1046.1.348
#	include/asm-generic/sections.h	1.1.1.1 -> 1.3    
#	include/asm-ia64/io.h	1.13.1.2 -> 1.17   
#	include/linux/sched.h	1.151.1.6 -> 1.158  
#	       kernel/fork.c	1.124.1.10 -> 1.129  
#	        kernel/sys.c	1.43.1.9 -> 1.48   
#	include/asm-i386/thread_info.h	1.11.1.2 -> 1.14   
#	include/asm-ppc/unistd.h	1.23.1.2 -> 1.26   
#	       kernel/time.c	1.11.1.5 -> 1.17   
#	include/linux/nfs_fs.h	1.45.1.2 -> 1.48   
#	drivers/media/video/Makefile	1.18.1.1 -> 1.20   
#	include/linux/pci_ids.h	1.103.1.7 -> 1.107  
#	 include/linux/pci.h	1.90.1.12 -> 1.95   
#	drivers/serial/Makefile	1.14.1.4 -> 1.20   
#	   drivers/net/tg3.c	1.72.1.3 -> 1.75   
#	        usr/Makefile	1.6.2.4 -> 1.9    
#	arch/ppc64/mm/init.c	1.46.1.2 -> 1.50   
#	drivers/char/agp/i460-agp.c	1.25.1.1 -> 1.28   
#	            Makefile	1.410.3.7 -> 1.417  
#	arch/ppc64/kernel/prom.c	1.28.1.2 -> 1.32   
#	     kernel/module.c	1.86.1.4 -> 1.90   
#	include/linux/module.h	1.66.1.2 -> 1.68   
#	           mm/slab.c	1.93.1.2 -> 1.96   
#	      kernel/sched.c	1.193.1.11 -> 1.200  
#	  drivers/acpi/osl.c	1.37.1.4 -> 1.42   
#	drivers/serial/Kconfig	1.8.1.5 -> 1.14   
#	include/asm-i386/hw_irq.h	1.21.1.2 -> 1.25   
#	drivers/scsi/qla1280.c	1.38.1.2 -> 1.40   
#	drivers/scsi/sym53c8xx_2/sym_glue.c	1.23.1.4 -> 1.26   
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile	Mon Sep 22 13:02:01 2003
+++ b/Makefile	Mon Sep 22 13:02:01 2003
@@ -213,7 +213,7 @@
 NOSTDINC_FLAGS  = -nostdinc -iwithprefix include
 
 CPPFLAGS	:= -D__KERNEL__ -Iinclude
-CFLAGS 		:= $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
+CFLAGS 		:= $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -g -O2 \
 	  	   -fno-strict-aliasing -fno-common
 AFLAGS		:= -D__ASSEMBLY__ $(CPPFLAGS)
 
diff -Nru a/drivers/media/video/Makefile b/drivers/media/video/Makefile
--- a/drivers/media/video/Makefile	Mon Sep 22 13:02:01 2003
+++ b/drivers/media/video/Makefile	Mon Sep 22 13:02:01 2003
@@ -6,6 +6,8 @@
 			bttv-risc.o bttv-vbi.o
 zoran-objs      :=	zr36120.o zr36120_i2c.o zr36120_mem.o
 
+obj-y		:=	dummy.o
+
 obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o
 
 obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \
diff -Nru a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
--- a/drivers/scsi/qla1280.c	Mon Sep 22 13:02:01 2003
+++ b/drivers/scsi/qla1280.c	Mon Sep 22 13:02:01 2003
@@ -284,7 +284,7 @@
 #define  QL1280_TARGET_MODE_SUPPORT    0	/* Target mode support */
 #define  QL1280_LUN_SUPPORT            0
 #define  WATCHDOGTIMER                 0
-#define  MEMORY_MAPPED_IO              0
+#define  MEMORY_MAPPED_IO              1
 #define  DEBUG_QLA1280_INTR            0
 #define  USE_NVRAM_DEFAULTS	       0
 #define  DEBUG_PRINT_NVRAM             0
@@ -2491,7 +2491,7 @@
 	/*
 	 * Get memory mapped I/O address.
 	 */
-	pci_read_config_word (ha->pdev, PCI_BASE_ADDRESS_1, &mmapbase);
+	pci_read_config_dword (ha->pdev, PCI_BASE_ADDRESS_1, &mmapbase);
 	mmapbase &= PCI_BASE_ADDRESS_MEM_MASK;
 
 	/*
diff -Nru a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
--- a/include/linux/nfs_fs.h	Mon Sep 22 13:02:01 2003
+++ b/include/linux/nfs_fs.h	Mon Sep 22 13:02:01 2003
@@ -410,7 +410,7 @@
 nfs_size_to_loff_t(__u64 size)
 {
 	loff_t maxsz = (((loff_t) ULONG_MAX) << PAGE_CACHE_SHIFT) + PAGE_CACHE_SIZE - 1;
-	if (size > maxsz)
+	if (size > (__u64) maxsz)
 		return maxsz;
 	return (loff_t) size;
 }